Arnaud Rebillout [Tue, 12 Nov 2019 01:18:22 +0000 (01:18 +0000)]
libnetwork_proto_no_unrecognized_all
Fix this by setting goproto_unrecognized_all=false which suppresses this field.
Upstream doesn't have the problem because they have pinned an older version
of gogo/protobuf: https://github.com/docker/libnetwork/pull/2242
Author: Felix Geyer <fgeyer@debian.org>
Gbp-Pq: Name libnetwork_proto_no_unrecognized_all.patch
Arnaud Rebillout [Tue, 12 Nov 2019 01:18:22 +0000 (01:18 +0000)]
cli-dont-duplicate-authconfig
~~~~ gitlab-runner
src/gitlab.com/gitlab-org/gitlab-runner/helpers/docker/auth_config.go:102:22: cannot use config.AuthConfigs (type map[string]"github.com/docker/cli/cli/config/types".AuthConfig] as type map[string]"github.com/docker/docker/api/types".AuthConfig] in argument to addAll
src/gitlab.com/gitlab-org/gitlab-runner/helpers/docker/auth_config.go:130:2: cannot use newAuths (type map[string]"github.com/docker/cli/cli/config/types".AuthConfig] as type map[string]"github.com/docker/docker/api/types".AuthConfig] in return argument
src/gitlab.com/gitlab-org/gitlab-runner/helpers/docker/auth_config.go:144:26: cannot use newAuths (type "github.com/docker/cli/cli/config/types".AuthConfig)
~~~~
~~~~ nomad
src/github.com/hashicorp/nomad/drivers/docker/utils.go:118:57: cannot use cfile.AuthConfigs (type map[string]"github.com/docker/cli/cli/config/types".AuthConfig] as type map[string]"github.com/docker/docker/api/types".AuthConfig] in argument to "github.com/docker/docker/registry".ResolveAuthConfig
~~~~
Please update this patch when upstream provides a fix.
Signed-off-by: Arnaud Rebillout <arnaud.rebillout@collabora.com>
Gbp-Pq: Name cli-dont-duplicate-authconfig.patch
Arnaud Rebillout [Thu, 10 Oct 2019 13:42:00 +0000 (20:42 +0700)]
Disable Microsoft/hcsshim
As far as I understand, this is only needed for Docker running on a
Windows host. Grepping the code shows that only Windows specific files
import Microsoft/hcsshim. The only exception is the file
`libcontainerd/remote/client.go`.
Forwarded: https://github.com/moby/moby/issues/40067 Signed-off-by: Arnaud Rebillout <arnaud.rebillout@collabora.com>
Gbp-Pq: Name engine-disable-microsoft-hcsshim.patch